Fix issues with EOL characters