another round of non-blocking optimizations