Improve debugging output