Some cleanups for the Travis CI build