Add some more debug logging