Further fixes needed for demo