more upstream updates for scripts
warning fix