Fix number agreement niggles.