Update for rust 0.11