Merge "Fix logging"