valiation : fix some regressions