More fixes for delayed bloody shutdown!