Second version of conversion fixes