Added compatibility changes for Windows platform