More init script changes