adjust some DEBUG_MSGs