Minor tweaks to debugging output