small demo fixes