Small script changes