Minor tweaks to the default config to sate OCD.