Fix issues with line endings and spaces