Windows-specific fixes on top of git