Correcting javadoc links - repeats commit a51b2ae
Repeating commit 2db7a94 - bad use of flags but the solution is okay for now