Fix a few panics, demo works again