Redo the way DEBUG is handled