Fix a bunch of validation errors and stray tags