small fixes
remove incorrect weak ref values