Demo fixes

Fixes #90 and #88