Some configuration tweaks.