fixed some new compile errors on Windows