Fix experimental JSON support