Hi, I had been noticing some hangs in my simulations, and finally had enough time (and a machine that they reproduce on easily - it's a timing thing) to debug, so two small fixes for this. v2: * remove change-id ... johannes