some configuration fixups