generic stability improvements