[dev] Small fixes for funct -> funct11 upgrade.