tweaks to debug messages
(cherry picked from commit 873144ded360112d26c77f6426905f6ac3b27658)