More markup tweaks for the spec