Fix some retain cycles