More style consistency fixes