Fixed build issues in Windows