Bug fixes in Demo