Fix some more travis warnings/errors