[Debugging] Change around some debug log entries to aid troubleshooting