WIP: Additional debugging

Change-Id: Ib643ab9eaf67dd7192eb3df3504ef945b27ea34b