Update to fix build issues on Linux introduced by windows changes