Some more fixes on WeakReferences checks