Style Issues After Upgrade 4-1-0