Fix Int64/Float conversion