Minor tweaks for debug