Trying to fix some MSW bugs...