An attempt to fix failing Travis tests