EOD 4/23

Fixes as per this morning’s web meeting.