Fix some minor style issues