Fix for legacy MAC_* charset conversions