EOL standardization fixes