demo data fixes