Threading stability changes