3788.  Fixed a few remaining config changes needed for the conversion.