More Style Cop fixes