Update scripts' fixes