diff --git a/opentelemetry-datadog/README.md b/opentelemetry-datadog/README.md
index d1da8a92fb..a0323b55d7 100644
--- a/opentelemetry-datadog/README.md
+++ b/opentelemetry-datadog/README.md
@@ -82,7 +82,7 @@ to [`Datadog`].
          // Traced app logic here...
      });
      
-     opentelemetry::global::shut_down_provider();
+     opentelemetry::global::shutdown_tracer_provider();
 
      Ok(())
  }
diff --git a/opentelemetry-jaeger/README.md b/opentelemetry-jaeger/README.md
index 5ad05f50f6..18c896f83e 100644
--- a/opentelemetry-jaeger/README.md
+++ b/opentelemetry-jaeger/README.md
@@ -53,7 +53,7 @@ fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
         // Traced app logic here...
     });
 
-    global::shut_down_provider(); // sending remaining spans
+    global::shutdown_tracer_provider(); // sending remaining spans
 
     Ok(())
 }
@@ -131,7 +131,7 @@ fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
         // Traced app logic here...
     });
 
-    opentelemetry::global::shut_down_provider(); // sending remaining spans
+    opentelemetry::global::shutdown_tracer_provider(); // sending remaining spans
 
     Ok(())
 }
@@ -175,7 +175,7 @@ fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
         // Traced app logic here...
     });
 
-    global::shut_down_provider(); // sending remaining spans
+    global::shutdown_tracer_provider(); // sending remaining spans
 
     Ok(())
 }
diff --git a/opentelemetry-zipkin/README.md b/opentelemetry-zipkin/README.md
index c9af64e33c..bdc9028a32 100644
--- a/opentelemetry-zipkin/README.md
+++ b/opentelemetry-zipkin/README.md
@@ -53,7 +53,7 @@ fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
         // Traced app logic here...
     });
     
-    global::shut_down_provider();
+    global::shutdown_tracer_provider();
 
     Ok(())
 }
@@ -153,7 +153,7 @@ fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
         // Traced app logic here...
     });
     
-    global::shut_down_provider();
+    global::shutdown_tracer_provider();
 
     Ok(())
 }
diff --git a/opentelemetry/src/sdk/trace/span.rs b/opentelemetry/src/sdk/trace/span.rs
index 1fe65d636a..0830af6a93 100644
--- a/opentelemetry/src/sdk/trace/span.rs
+++ b/opentelemetry/src/sdk/trace/span.rs
@@ -523,8 +523,8 @@ mod tests {
 
         let mut link = Link::new(
             SpanContext::new(
-                TraceId::from_u128(0),
-                SpanId::from_u64(0),
+                TraceId::from_u128(12),
+                SpanId::from_u64(12),
                 0,
                 false,
                 Default::default(),
diff --git a/opentelemetry/src/trace/tracer.rs b/opentelemetry/src/trace/tracer.rs
index 1350f14467..259d54716b 100644
--- a/opentelemetry/src/trace/tracer.rs
+++ b/opentelemetry/src/trace/tracer.rs
@@ -458,7 +458,8 @@ impl SpanBuilder {
     }
 
     /// Assign links
-    pub fn with_links(self, links: Vec<Link>) -> Self {
+    pub fn with_links(self, mut links: Vec<Link>) -> Self {
+        links.retain(|l| l.span_context().is_valid());
         SpanBuilder {
             links: Some(links),
             ..self