Debug output tweaks.