Fixing failing coding standards