Tweaks to pass Travis build