Fix some calls after refactoring