Tweaks so Travis build passes