More script corrections