More wincheck changes