Some config tweaks

Some config tweaks