local patches for j-interop