Init script fixes