More style fixes to the new metadata