Final fix for links