Update for Windows compatibility