Fixed delete locking
More fetch updates
More fixes