Changes: modify debug messages