Fixes for javadoc bugs found by Monster'