Some Javadoc warnings eliminated