Threading tweaks