Update to JNIBWAPI
Changes for JNIBWAPI update, other misc fixes