additional migration fixes and updates