More tweaks to thread fields