Fixes: javadoc errors and lint warnings