Fixed some DEBUG stuff again