More fixes to the formalization