Fixes to v2 script components