Put in a bit more debugging