Tweaks to try to fix demo.