Add more debugging info