Fixes to JavaDoc generation WARNings