Updating scripts with fixes