Fixed EOL issues