Fixes after refactoring of live demo