Even more fixes for stasis.