Fix a few style issues