small demo related  fixes