More fixes from the conversion