JIRA DOMINO-23: Corrections