Fix a lot of stlye xml warnings