More and more appveyor/travis ci fixes.