Migration fixes
Re-write