Fixed MSVS build issues.