Some fixes in demos
Merge branch 'hotfix/demo'