objective-c wrapping fixes