Some cleanups to scripts.