diff --git a/doc/guide-runtime.md b/doc/guide-runtime.md
index 86a8c23d947b1..d4ffb4c11552a 100644
--- a/doc/guide-runtime.md
+++ b/doc/guide-runtime.md
@@ -202,7 +202,7 @@ Some benefits of using libgreen are:
 
 M:N threading is built upon the concept of a pool of M OS threads (which
 libgreen refers to as schedulers), able to run N Rust tasks. This abstraction is
-encompassed in libgreen's [`SchedPool`][schedpool] type. This type allows for
+encompassed in libgreen's [`SchedPool`](green/struct.SchedPool.html) type. This type allows for
 fine-grained control over the pool of schedulers which will be used to run Rust
 tasks.
 
diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs
index 7aa966802f2f5..9088ee6898b17 100644
--- a/src/libstd/rt/mod.rs
+++ b/src/libstd/rt/mod.rs
@@ -41,16 +41,14 @@ out of `rt` as development proceeds.
 Several modules in `core` are clients of `rt`:
 
 * `std::task` - The user-facing interface to the Rust task model.
-* `std::task::local_data` - The interface to local data.
+* `std::local_data` - The interface to local data.
 * `std::gc` - The garbage collector.
 * `std::unstable::lang` - Miscellaneous lang items, some of which rely on `std::rt`.
 * `std::condition` - Uses local data.
 * `std::cleanup` - Local heap destruction.
 * `std::io` - In the future `std::io` will use an `rt` implementation.
 * `std::logging`
-* `std::pipes`
 * `std::comm`
-* `std::stackwalk`
 
 */