fixes for improperly nil'ing and relying on nil'd weak pointers