Merge "more logging fixes"