More changes to try to diagnose Travis failure.