Configuration tweaks