Some fixes after normative control.