Solution 1:

This is always a problem. I think it has always been accepted that the unit should be treated as singular when it acts as a unit. The board directs that [some action be taken]

...but as plural when indiviuality plays a part e.g. The board enjoyed their Christmas lunch