Fixes for proper logging statements as per defined standard.