Fixed Windows build

Don't merge until Travis approves the changes.