Fix appveyor builds

These changes resulted in a clean test run on my windows 7 vm with xampp. My hope is that it also gets the appveyor builds passing as well.