Update for Rust 0.11