more fixes for new link info code.