Add some more debug info

Change-Id: If03b0769f4a3f6640790a9da5ba94554d9f9fac5