More style and magic word fixes