More debug output

Change-Id: I31852840d96bd86dcf78ffa9fd7d8f08333ef37c