Fixed bugs in Demo mode