further changes to address VS2013 compile errors and warnings