Merge "Fix several small logging issues."