Small improvment + crash fix
Small fixes. Divide by 2 the service count...