Trying to fix failing Travis CI builds