Update for rust 0.8