fixes to get Rhino3dmIo compiling again on master