Some minor debug changes