Replace some spinwaits for increased performance

Significant performance increase in some environments