Thread fixes.  NWN internals bug remaining.