Float double fixes

Review by @sjrd