yet more stability improvements