Build: warning fixes for VS2015 and <v141.
2 files changed