Updated debug defines