conversion fixes / tweaks