Some config issue fixes