Tweaks to demo code.