Merge "Small script fixes."