Fix more samples