Trying to fix some Windows bugs...