Some fixes for the handling of nuked threads.