More fixes
Fix floating point issues