HTML fixes #2