More fixes from conversion.