small configuration improvements