Miscellaneous migration changes