Final fixes to Travis test, hopefully