Fix harmless printing of warning on Windows.
logging, indentation.
Merge pull request #1865 from jimis/cfupgrade

Cfupgrade minor fixes.