Address more review comments.
Fix Migration code.