Fix some messed up tags