Merge "Fix build - style issues."