Javadoc fixes and minor cleanups