Java docs tweaks to make javadoc build pass
Javadoc improvements