Changes are response to windows build fixes.
Removed debugging print statements.
Fixed output typo.
Merge branch 'windows_support_updates' into windows_support

* windows_support_updates:
  Fixed output typo.
  Removed debugging print statements.
  Changes are response to windows build fixes.