Fix a few coding style issues