Changes to fd2ep for locking and disconnect locking