Style Cop fixes