Fix fuzzes after upstream commit