Fixes for ObjC support