Fixes to ensure that multiple scripts don't display