Merge "Fix logging issues"