Some config updates and cleanup