Update to work with rust 8.x-pre