Fixes some stuff.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge migrator's note during migration.

Signed-off-by: crynobone <crynobone@gmail.com>