Fixed retain cycle bugs

Signed-off-by: kg8gk <noahdblues@gmail.com>