Trying to fix build problems on Travis CI