Tweaks to make testable on Travis