Tweaks for convert