More fixes for links