Fix the AppVeyor build errors

And that's about it. :+1: