More fixes to links