Fix more particle stuff