Script Fixes