Cpl more demo fixes