Debug settings improvements