Updated for Windows compatibility changes