Fix minor coding style issues found by landscape