Tweaks to Z3-nate version