Fix links according to beminfo-628