minor stability tweaks