Further fixes to stasis (hopefully the last one for now).