Fix up even more of the markup