Some more debug changes.