Fix VM "goodbye" for real