More style check tweaks