Apply further fixes from Ron.