Few bug fixes to demo