Fixed JSON issues