fix use of ManualShutdownRepository to be consistent