Some changes in the debug output