Fixes to Winston support