Some link data fixes