More changes to get travis working