More annoying debugging

Change-Id: I7a75ac1fbc9704351ba691089179acb81976088b