changes to shutdown of actors