Fix compat with the current rust master