Fixed issues in demo