More configuration tweaks