Conversion tweaks