Minor stability tweaks.