Hopefully final TravisCI fixes