Improve debug output

Change-Id: Iba0c35a5bc07ac7b67186c3eeae1a2c926a6bc69