Some changes to debug logging messages.