Update configuration options to be a little more "sane"