Fixes after DMI change