VC++ compilation fixes.