Fix failing Travis builds