Minor tweaks found useful in demos.