Various coding standards fixes