Small changes and init script