More conversion fixes