fixed some more locking cases