Fixed issues in Demo