Migrated some deprecated calls