Fixed Some Linking