Minor coding standards fixes