Fix more shutdown cleanup errors