Fix style errors in recent pull requests