fixed locks and stopping of actors