float/long fixes