more line-ending fixes