Fix VS build issues...