Updates for v1.25 release
Some minor JavaDoc fixes