small demo related fixes