Bugfixes found during demo setup