Fixes and upgrading config.