CRLF fixes

Issue #579

In case the manual mode is chosen.