Fix JSON support