Some more html fixes