André Hentschel : winemaker: Fix optimizations.