minor changes for Windows compatibility