Updated some unsafe pointers to weak