Other script changes