Unwrap buffer management