Fix javadoc errors

Fix some javadoc errors that were preventing the build from completing when using JDK 1.8.