Fixing buffering issues.