First part of demo fixes