Add more debugging for GH-2