Fixed some DEBUG stuff