Continue cleanup; Fix RingBuffer code