conversion fixes/improvements