Fixes buffer update management