Improvements to Winston support