Fixing two windows specific issues.