Travis fixes

... because TravisCI likes to cause trouble