Couple of bug fixes in the lock manager.