Line ending fixes from previous commit