Fixing javadoc vomit and build break due to javadoc.