Switching to floats would probably be safer in the long term, but too many things to test to do that now.