Some linkto minor fixes