Linking fixes