demo bugfixes
Merge branch 'demofixes'