Couple small demo fixes