Fixes for Rust 2014-12-20