Hopeful fixes for both travis/appveyor.