Only debug output tweaks...