More fixes to Travis.