Bugfixes towards izzy demo