Fix EOL problems