Minor stability improvements in block emerge handling