Improved debug statements