demo fixes