Fixes some compiling issues on VS 2012 CTP

I have 2 files changed in order to compile using VS 2012 CTP...

There are also 2 files with my personal comments that I don't know how to remove from pull request... They obviously have to be removed !!

Tkz 

Velteyn