Tweaks to CompassDemo