Tweaked debug a bit