Some fixes for v2 JSON Response differences