Debug settings improvement