More style cop fixes