Change all weak references to strong