fix them to support windows