Fix linkages