various configuration tweaks