J2ObjC fork with some fixes