conversion fixes