[z2638] Fix some small issues on VS2010 files