More Rounding Bug Fixes