Some debug changes