Some changes in debugging.