fix obsolete calls