Some more HTML fixes