More markup tweaks