Adjust locking to never ulock doubly
Localize locing a bit more