Minor tweaks to debug print