Some minor script changes