Refix EOL Issues