Add more granular buffer locking.