Add some more debug info
Merge