Sorry Haacked, I can't stand it anymore
Fix up Windows build