Tweaks to consumer example and exports