Fixes to rounding