Merge "Fix minor style issues"