Improvements to the LinkHelper