HTML validation, minor fixes