demo: Fixup and extend simple example demos