Tweaks to improve travis workflow