Fixes for line endings