Fixed some deadlocking issues with normal locking requests.