Fix new line issues.

No code changes, simply fix the issues with carriage returns.