Yet more demo changes