Update to JSON export helper to better handle floats