Updates to fix Travis CI build