Fixed rounding issues