More fixes, stabilization