Merge "Fix some style issues"