Couple of debug modifications.