Improve debug output

Change-Id: Ia09e61a37bc485509c604df9279275003050d916