Try to fix windows newline and patch handling