More Debug Message Tweaking