daggerrz Fix stateful demos after refactor