Tweaks to travis build