More changes to get Travis passing