Cosmetic fixes to logging

Jira-issue: WP-1286