tweak some modules to make migrations work