Updated remaining output buffer routines