More fixes to Travis CI matrix.