few more fixes of wrong function references