Making more optimizations to the configs.