Fix several @link javadoc warnings

More changes to repair @link javadoc warnings