Hopefully final fixes for appveyor and travis ci.