Some simple changes before thread IDs.