Fix mac/win compiles