Another batch of JavaDoc fixes