Fix rounding issues