Fix warning and msvcc patches
6 files changed