Tweak to some debug logging