A few addition to debug output.