Windows line ending issue fixes

Some fixes from Codefest.