Small changes to get Winn out of MSJ sometimes