Stability tweaks