More SWIG JNI fixes.