Fix regressions concerning rounding introduced by the 2 last commits.