Improve some debugging messages.