Further fixes after change in script names.