Couple of bug fixes and workarounds for javalibpst.