Fixes for rust 2014 07 03