Use more sensible buffer sizes