Fix a few more compile errors on win