Multiple Travis fixes