Fix style issues found by gjslist