Bug 998444 - Migration fixes.