operation queue fixes