fixing windows specific bugs