Updates to handle `docker stop`