Minor changes to investigate why migration fails