Rhino 6 bugs

RH-45933 is fixed in the latest Service Release Candidate