A few stability tweaks!