Update files to better support windows