A few rounding fixes