Further fixes in scripts.