Fix style issues to make the build succeed