More fixes for incorrect floats