Fixes coding standard conflicts