Further configuration adjustments