Add: various minor fixings to the invar class support.