Some coding standards fixes