BUG: Properly replace links to mds