Updates for 'threading' workarounds