Improve debugging messages