Fixes with delegate after ARC