Fix minor issues

See https://govuk.zendesk.com/agent/#/tickets/723739