Changes made for Windows compatibility