More fixes for VC on Win.