Fix potential retain cycles