Fix logger usage - third bunch of changes.
Fix logger usage - forth bunch.