Merge "Minor Logging Changes"