More coding standards fixes