More script fixing