Buff overrun fix and update