Minor tweaks to default config values