XD-622 Various Javadoc Fixes

Remove warnings from build.