More fixes to run nacl on windows