More Travis fixes