Fixing windows build PART 2