D&B links, amongst other fixes