Javadoc fixes, small change to make Findbugs happy