Fix a few style breakages