Stabilization/TPA: fixes from review