More fixes to Travis config