a few minor updates for Rust 0.11