UPR Conversion fixes