Fix building with current rust