Attempting to fix Travis CI build errors.