Windows compatibility changes