minor mp optimizations