Don't depend on 'DEBUG' defined
Fix references to this->debug
Changes to how debug object is referenced