Working on making the build pass on Travis CI