Fixes to convert_r3