More fixes to the RDEF.