Add still more debugging information