Fix line endings
Fix incorrect tagging