(Fixing compilation error due to a RC2-to-final change, also a JavaDoc error.)