Fix and simplify float conversions