Fix scripts to set correct cmdline values