General improvements to stability