Small configuration tweaks