db_setup_demo fixes