Fix some coding style errors