make smp code more similar to upstream