Fix more circular buffer problems.