Some config improvements