Fix build with rust master