Improved debug info.