Attempted to fix OSX/Linux regressions on Windows