More changes to speed up travis-ci