Update for rust 0.9