More fixes to METRO's form.