* Try to fix JSON issues