Small improvements to demo.