Fixes for Script