Fixed issues with demo app