Add more output buffering