Fixed demo app issues
Fixed demo app issues