Some debug page fixes