Fix a few more bugs with HTML