Small configuration adjustments