Another shot of fixes for Travis CI