Fix some configuration mismatches