Some conversion fixes and implementation