Fix float issues