Fix line endings.
Fix some bad wording in an error message.