Fix some more javadoc