interim changes for VS 2013 upgrade.
Tests via VS 2013 all pass.