Some fixes for OFObject.