Fix rounding problems