Misc script changes.