Add more debugging

Change-Id: Ib421266a9c26e42e8cfa84801e64be8ff078d63d