fixed some weak refs