More i686 thread work.