Updates to debug problem shutting down