Fixed Windows build issues (hack)