Merge change Iac175b4f

* changes:
  Two minor JNI fixes.