Migrate to Iridium 2.1
Minor fixes for the iRidium 2.1 migration.