Fix things thrown up by Travis