Fix JSON issues