more fixes for links