Minor: fixed issues on json serializer