Several fixes (services management)