More R3 conversion fixes