Make debug logging a bit more consistent