Update to be compatible with rust master