Some more coding standard updates