More granular locking on disconnects.