Second part of demo fixes