Fixing issues with compile under vc11.
More fixes to get compilation working on vc11.