Fixing the demo errors