A few configuration tweaks...