Fixing calls following API changes