Travis CI further fixes