Attempt to fix issues with demo data AND upgrading.