Improved shutdown of actionMan