Travis CI test fixes. Can't reproduce locally.