Make build pass on Travis CI