Bug fixes in the demo app