A few java-doc improvements