Fix outdated function calls