Fix some configuration quandaries