minor updates that seem to have got lost in previous merge