Fix build with current rust