some performances improvements in -debug