Conversion improvements