Add some more debugging