More changes to debug code