Fix config pre migration

A couple of configs cause issues with the migration script, and it is easiest
to fix them here before running the migration script.