More init script fixes