Merge "Fixed buffering issues."