More style processing fixes