More ObjC gateway work