more demo fixes