Fix broken references in Javadoc

Fix some references to parameters and methods in the javadoc
Merge branch 'improve-javadoc'