Clean up more HTML validation issues