Fix Norbert upgrade.