Final fixes from Hugh's list