Fixed some more shutdown