Fixes to old version migration