Added several more DEBUG conditionals