Re: [PATCH] winemaker fixes