Upgrades to moira