Fix a few panics, demo works again
Merge pull request #109 from DavidVorick/demofix

Fix a few panics, demo works again