More bug fixes for JSON...