Thread-hiding, minor improvements