Fixed JSON parser issues