Fixed bad linkages