Minor configuration improvements