Attempting to fix errors with demo data.