Fix some bugs in the v2 API work
Fix some bugs in the v2 API work

kdzwinel/polyfill-service,mcshaz/polyfill-service,kdzwinel/polyfill-service,mcshaz/polyfill-service,mcshaz/polyfill-service,JakeChampion/polyfill-service,jonathan-fielding/polyfill-service,kdzwinel/polyfill-service,jonathan-fielding/polyfill-service,JakeChampion/polyfill-service,jonathan-fielding/polyfill-service