Minor changes for plugging in winnow