Cosmetics
Add code for migrating existing configs
Fix warning