Fix style issues with recent update