Update to run on Rust 0.12