Fix some output format issues

Change-Id: I6eab9da1f0c4ff047b27c3d8c572d587a32d61ce
4 files changed