Minor fixes

Minor fixes to build with VC++ Express