Small improvements to the demo app.