Product link fixes