Fixed issues that prevented the demo app from working