More fixes to stasis.