Fix the down of a migration, and rescue a rename
Cleanup