Rework some config options