Some minor debug info tweaks