add proper locking to actor group changes