Yet more javadoc fixes