Updating Menagerie to ensure connections are closed all the way.