Fixed retain cycles issues