Buffering fixes.