More Rhino compatibility fixes