Fix minor coding style issues