migration fixes 3