Fix more demos