Minor changes to the way links are handled