More fine tuning to workaround buffering issues.