Make more stuff floats, for consistency