more shutdown bugs