Small Fixes

Small fixes to jware.jar